Remove conflict markers.

Mon Aug 23 17:33:52 2004  Soeren Sandmann  <sandmann@redhat.com>

	* ChangeLog: Remove conflict markers.

diff --git a/ChangeLog b/ChangeLog
index 141a75195275af187b22620de6421c1107e33a2e..2d4373e380ebcc343b27a5e825a59672522c6396 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1608,7 +1608,6 @@ Mon Jul 12 00:52:04 2004  Matthias Clasen  <maclas@gmx.de>
        items.  (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte,
        Michael Opdenacker)
 
->>>>>>> 1.5542
 Sun Jul 11 15:24:03 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        Bug 143330, support update counter spec.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 141a75195275af187b22620de6421c1107e33a2e..2d4373e380ebcc343b27a5e825a59672522c6396 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1608,7 +1608,6 @@ Mon Jul 12 00:52:04 2004  Matthias Clasen  <maclas@gmx.de>
        items.  (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte,
        Michael Opdenacker)
 
->>>>>>> 1.5542
 Sun Jul 11 15:24:03 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        Bug 143330, support update counter spec.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 141a75195275af187b22620de6421c1107e33a2e..2d4373e380ebcc343b27a5e825a59672522c6396 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1608,7 +1608,6 @@ Mon Jul 12 00:52:04 2004  Matthias Clasen  <maclas@gmx.de>
        items.  (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte,
        Michael Opdenacker)
 
->>>>>>> 1.5542
 Sun Jul 11 15:24:03 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        Bug 143330, support update counter spec.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 141a75195275af187b22620de6421c1107e33a2e..2d4373e380ebcc343b27a5e825a59672522c6396 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1608,7 +1608,6 @@ Mon Jul 12 00:52:04 2004  Matthias Clasen  <maclas@gmx.de>
        items.  (#102530, #68015, #109811, Jordi Mallach, Benjamin Otte,
        Michael Opdenacker)
 
->>>>>>> 1.5542
 Sun Jul 11 15:24:03 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        Bug 143330, support update counter spec.